7bb71f68d2d3ed2b20ffeb9f7cb8e90d265e7bda,graylog2-server/src/main/java/org/graylog2/periodical/AlertScannerThread.java,AlertScannerThread,run,#,40

Before Change


                        if (stream.getAlertReceivers().size() > 0) {
                            try {
                                AlertSender sender = new AlertSender(core);
                                sender.sendEmails(stream, result);
                            } catch (TransportConfigurationException e) {
                                LOG.warn("Stream [{}] has alert receivers and is triggered, but email transport is not configured.", stream);
                            } catch (Exception e) {

After Change


                        if (stream.getAlertReceivers().size() > 0) {
                            try {
                                AlertSender sender = new AlertSender(core);
                                if (alertCondition.getBacklog() > 0 && alertCondition.getSearchHits() != null) {
                                    List<Message> backlog = Lists.newArrayList();
                                    for (SearchHit searchHit : alertCondition.getSearchHits().getHits()) {
                                        backlog.add(new Message(searchHit.getSource()));
                                    }
                                    sender.sendEmails(stream, result, backlog.subList(0, alertCondition.getBacklog()));
                                } else {
                                    sender.sendEmails(stream, result);
                                }
                            } catch (TransportConfigurationException e) {
                                LOG.warn("Stream [{}] has alert receivers and is triggered, but email transport is not configured.", stream);